From a7e7094ccf0802a4708d4f6db2d5c1ad82eb2071 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Mon, 17 Jan 2022 02:12:08 +0000 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 515941 -> 516250 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index efe5d54d10f..362ddb2c95f 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -321,6 +321,7 @@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index ef982f3f27b0768d82a9653dad2829d81bc5f2a0..4fd90f7fd1d2795fae498a921c6bf16080b07b15 100644 GIT binary patch delta 229 zcmaF5Pkz=x`Gyw87N!>FEi5zhrYk*Q5t)9$pH;|Q#mh0w(bF%)H7Fp+6-X*%7Auq% zXXd3Vlw_nTM5PwxD}?#RYH}$cfy^|8>A5K^iahB>sRatUgl`XxRXV0xXI~MNg{pT3j zr=NFZ7MUy{!oK}*9!ogm^gm&&oB|-X#d{#kn_l>iDP+1|C<|MAQ2`4OvjQ>O_M!sz G&v^i&MoF#! delta 66 zcmbPrQ2yyY`Gyw87N!>FEi5zhrWbawiA+z>WaF4FV8q6^{cb)>IOFs={%pR}1=3i! U+m{!z05K~Nvu$5q$o@GG04TK>MgRZ+ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 0d5fca58d2c..6bbe1e826e3 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -59,10 +59,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2